Invalid tmp screen now works, some polishing