Added mochijson2's modules. Some minor improvements and cleaning up