minor enhancements, set defaults for defaults
Release 0.2.0