more sizing and scaling fixes