Fix some German translation issues and clean up a little