Final round of bug fixes and completed report