Updated with everything

Updated with demo day stuff and additional control fixes.