more display changes and some more hardcoded data and changes