Some tweaks to screen and other