minor bugfixes and tweeks from labs