Some simple bugfixes & language changes