updates based on beta 5 fixes