Comments and a few minor changes to start event