More comments and start-up crash fix
Merge remote-tracking branch 'origin/master'