Minor edits and little improvements