a few more bugfixes, and some renaming