added hardware enums, fixed all references