Changes to modules and docs