Fixes
Timer + Refactor

Lots of clean bits + a realtime timer (iOS)