Added controls for everything, added toggles for several features,
general cleaning up