Numerous fixes and reflow improvements.