Removed the shadow, combined controllers, fixed a few bugs