Lots of fixes
Merge branch 'master' of https://github.com/ashtonkj/AASA