Some stability and display improvements.