Added printing authorization

Couple cleanups too.