some stuff done, added missing todos