Some corrections for initial mode

[mlgd]

[davecheney]

Thanks for your change. As you've probably discovered, this repo is long dead. I'm happy to merge this change once you've addressed my comments, but you may find it easier to fork and run. I won't take it personally :)