More edits, more code-tweaking, more notes on final things to fix...