more fixes.  still not workig