Checking minor TODO's off the list