fixing specs (but not yet completely)