Added comments and modified module configurations.