Tweaked a few thigs to make the defaults prettier (corrected).