Many updates for beta 3.  Not complete yet.