Change ElementTree to cElementTree, other minor fixes