Adding some more functionality
Fixing bug combining dictionaries
Improving memory usage