ENH: eye-candy improvements
WIP: