some more finals and removed some todos