lots of great fixes.  getting closer to working