changed all screen to Screen and cleaned up some backup files