some additional minor bug fixes