Made the defaults even more sensible.