Add some new ideas and remove one that has been done (+fix typo)