Cleaning up docs, minor mods to defaults