added todo items (by stefan keller @ talk-de)
added more TODO items (by Roland)