More reformatting/rewriting. Notes up to present