small bug fixes2