Make userId unique, close #960
Clean up ConsoleDataWriter groups, close #961