Updated module list class, and other stuff