Final Touchups : modular code, and proper presentation, interactive mode