update specs (and add "#TODO"s...)