Fixed some bugs. Changed to_dict to be able to return raw values, with no translation