Added: 'exit', 'none', and 'return' statements and cleaned up stuff.