Clean up some TODO's, fix some claiming issues