minor bug fixes III