small bug fixes and updates