bug fixes and display changes