Cleaned up zephyros.py a lot. I think it's actually done now.