Update with some FreeBSD and future work stuff