Some cleanup, and adding mollom submodule.