Added some modules.
Small fixes.