Fix comments
fixup! Implement multi uid support