fixes for defaults
minor cleanup, 0.1.4