Updated defaults and documentation