Drop some @todo's
Version bump.