updates and fixes, as well as deliverable generation