Fixes #105 & Fixes #80

Remove deliverables and fix date names