Sprint 5 Bug Fixing