MBH: updating todo, someone should create issues for these maybe