added CLI and ordered Map, bug of >1 values existant