Bug fixes. Visual improvements. Refactoring. Phase 2 Complete.