FIXME notes; minor style updates