added timers, fixed stuff, new colours etc