Timer bug Fix

All bugs are fixed
This version is considered complete