Added some modules
Some cleaning up