Edited to address a few remaining notes.