Overhaul and added GUI timer

Cleared most of the type warnings