Late commit of several todo comments and (possibly) small fixes