more cleanup and added modules
added modules to go with last commit