General changes

Ran CodeAnalysis as well, made some changes, fixed some bugs...
Removed debug statements
Added some Plans