Misc Updates and LinkedHashMap for ordered tags
Fixed bad merge
DevSync