* Add a few more @todo items (thanks to Irina Naumik for the feedback)