more debugging and a minor incremental fix for user mapping code