Mac ready
Merging with forgotten timers commmit
Some cosmetics