Improvements and bug fixes and ed parody