Couple bug fixes, removed top down controller