Language file changes + tweaks