Fix a few options and headers
fix leftover kexguess debugging