add some defaults, fix bug with quoting nil