parentesize some boolean logic and disable v7 stuff that isn't ready