bug fixes and a few name changes