final fixes with close and finish