Beta 5 updates. Some good cleanup. One hack because I think that something broke.