Fixed some small things, worked on Screen