Added use of the scratchpad and improved shortcuts