Bugs corrected. MrCylinder added. Test updated.