Pre Presentation Bug Fixes and Changes
Stage 1 Pre Presentation Bug Fixes