* add the possibility to go slower and faster (wasn't finished)
 * some cleaning and factorization