genshi doesn't work on py3k yet :(
fixed some pep8 indentation issues