fixup specs (to be refactored more)