Major Control Improvements and Shadow fixes