HashMap --> LinkedHashMap + fixes