More tweaks; re.py is nearly there...
3 files changed