More updates to regex and walkoff to hopefully fix.