Added stuff

Mostly in screen functions