typo
because logging is good
a couple of safeguards
py3k support
updated test to match new internal manager