A few tweaks; py3k support now complete.