add todos from Urs
partial instructions rewrite