minor bug fixes and name changes