Further bugs + todo updates