Change a few defaults & clean up