tidy up new features, round out specs testing them