more code massaging for disk space efficiency, comments, and nit-fix