Smeging update

the summary explains it.
Merge branch 'UI' of https://github.com/KimBurgess/AMX14 into UI