Fix warning
Fixup ugly text to not appear unless developer == 1
Get rid of unneccessary hack