Fixed double user list problem; other minor cleanup