Fixed comments and ungraceful disconnect.