Updated docs and a few default settings. Also added a couple of checks