minor fixups, and alias changes