Tidied up some TODO's and fixed some asserts