cleanup & fix (preparing for translation)

Signed-off-by: Cthulhux <git@tuxproject.de>