Resolving some more Trello TODOs

Well, there is still some stuff to do...