Cleaned up some of the Screen coding.  Started to add javadoc comments.