Various Edits made