Some consistency cleanups and docs