fix user mapping and add doco