Fixed modules
Lots of little changes