Add count, document some things that need to be added, but haven't been.