Bug Fixes and TimerHandler included