minor bug fixes and additions