fixed all my todos from the google doc