last push for the night, added fix requests