Clean up for final version, added editors notes