fixed controls, added timer