fixed a few things
Merge branch 'day2start' of https://github.com/makersquare/ativa into day2start