Final updates for beta 5 release