fixed user types.
merged.