bug fixes
Merge branch 'aaron' of github.com:Aloja/aloja