sample app and improvements in modules