small changes
small bug fixes