closing stuff fixes