Experimental new AE patch. Should fix all AE issues.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
Fix some mis-spellings which shouldn't be there, and add some which should.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>