private.xml: opt-h/l, comments, some cleanup