#25 Updated defaults.