Added timer controller & fixed bugs