Fixed first cycle run-time bugs
Screen broke - so some code is in (all the spaces) to work around that a bit.