Added some extra terminal functionality and started work on email