fixed some bounding issues