Fixes and consistency tweaks to lang