many fixes.  WIP - still broken because of node packages update