+ added module handling
+ added modules / tidy up