#67 minor bug fixes