Bug Fixes, Cleanup, Hive Integration
Added some cool new features