Santiago's #224 pull request (with minor edit) and cosmetic edits to miscellaneous modules