fixup zamboni header changes, better login, etc