updated module declaration
cleanup, defaults updated