Add FIXME notes and other comments.