Added more datatypes, updated some stuff