Typo
Remove wrong old stuff
Fix for macro - AEL problem
Merge branch '1.8_testing' of github.com:amooma/GS3 into 1.8_testing