some fixes.  some other bugs found.