More bugs and display changes.