some beauty fixes:)
mottek-stuff