some new TODO-entries =)