Merge 1 Phase 4

Removed certain features on request, Fixed bugs