clean up some defaults and prepare for next release