Implemented:

MultiMap and Fixed some minor issues