Removed iterm, and updated terminal. More general cleanup