Random fixes

Just small fixes I found while looking at the source code.

No change should alter behavior here.
I had a local change in this area to move the comment next to the sleep in `deploy_landscape()`. Looking in history that's where it belongs. Can you do that in this branch too please?