Controls refinement

Actually it's just a bunch of junk