Fixes & tweaks for language