minor bugfixes, and updates