Oops, a few cleanups, had problems with print2screen and function names.