Updates to defaults and added track controls