Definitely closer, fixed errors, but messed something up in the display?