addressed all todos, paper is now in submit-ready state :-)