WIP; random display tweaks.