now comes the time for fixes