97 fixes
97 fixes, part 2
97 fixes, part 3
Merge branch 'master' of https://github.com/n3wm1nd/TA