Minor tweaking and default options