Progmodel readthrough. Add todo and minor fixes