small bug fixes and name changes