Merge pull request #79 from reechani/master

Fixed minor issues in baddie1-3 after lew's tests
Fixed ordering of code after feedback