some more todos for Adt.scala