Fixes to display and logic