minor bugfixes before submission