Fix a couple of bugs, improve screen scripts.