Various small fixes and language additions