- reworked language stuff