- bug fixing and added timer class