First Round of Fixes
New Features