Implemented enhancements 4, 5 and 6. Resolved issues 1 and 3