Logic functions now consistently take state

prev: some took bridges instead
Buxfix
Solve 7s and 8s first for slight speedup