final fixes of the night