some edits
Added all the stuff