Cleaned up some of the todos