Controls are much cleaner now!
Some minor cleanups
Merge time