Tidy up some comments and remove a FIXME
Tidy up some comments and remove a FIXME

Code4SA/mapit,chris48s/mapit,Sinar/mapit,New-Bamboo/mapit,opencorato/mapit,opencorato/mapit,Code4SA/mapit,Code4SA/mapit,opencorato/mapit,chris48s/mapit,chris48s/mapit,New-Bamboo/mapit,Sinar/mapit