various breakthroughs and fixes