Removed some bugs from the new controls.