Added more types, fixed string dupe bug