Merge pull request #543 from way2muchnoise/master

fixes #515
Stupid null items

Someone should be shot
Merge pull request #545 from hilburn/master

Stupid null items
fixes #431 for real

the font renderer might need more cleaning will do later