tweaked comments to no longer be a TODO