Set reasonable defaults for more things

All current tests are passing now