Logical updates and tweaks to defaults

This PR attempts to bring us more in-line with Punchblocks mainline changes that have been or are expected to be merged in. Better defaults and handling of parameters.