More sane defaults added.