A few fixes

Mostly fixing some pain I ran into with doing fresh installs using a cluster name besides "main" (cluster did not yet exist and couldn't be reset) and with using "peer" as my default auth method.

I can split this into multiple PRs if you want.