Edits and improvements