Buncha comments

Also, moved terminating the runtime outside the try block. It should
still work - but if it doesn't, I'll put it back.
Merge remote-tracking branch 'origin/master' into gltest