Improvements to up/top.