Various Editing Changes and updates

Added Comments