Added some modules, small corrections.