Some Fixs.. & Edits