add some modules
cleanup