consistently use UID; fix comments