Some more fixes.  basic functionality seems to be working