Lots and lots of improvements on modules