Performance improvements based on Evil's latest python changes
Prettified output a little