lots of bug fixes and perf improvements to adv FE