filling in missing language stuff, along with some other tweaks and
changes