Add user column, fixed some issues