make more stuff override able via defaults and options, add a couple of tests