add data and fire specs + fix bug and improve other specs