Various mixed up changes, including making it work and using FreeBSD 10 BETA