Updated html; nearing final edits