fixes done by Till.
osd test
some cleanup and cosmetics