Fix some overly short lines
Update screen.
General cleanup