Adding six to modules, and fixing up a few related issues