fixed encoding
merge
fixed models