some fixes.  BETA 1