Lots of bug fixes
Fixing Timer settings, and refresh