HeadsUp: cleanup and some fixes