Usage update and FIXME notes.