stupid bug fix and updated modules constructors