more small bug/design fixes