Updated, and cleaned-up content-store notes.