Further Edits to Master: Updated Steve's Todo's