updates for beta 5

This should be everything. Builds and tests pass for me. if someone wants to pull it down and double check though, it would probably not hurt.