Load additional modules via config.php. Also, some whitespace and formatting changes.