Changes and fixes to project