Various fixes

Fixed modman file
Fixed module config.xml
Revert "Various fixes"

This reverts commit 06c2c332e5803f0bca2e3fe90ac3fbc57c7a3390.
Various fixes