Final #hackweek5 fixes!