Fixed and tested all update, export to jar and do another test run