big refactoring, final step : minor bugs + simplify actions on timer