adding some modules and cleaning up a bit