bug fixes and name changes
bug fixes and name changes