more small bug changes