corrected some weird spacing problems in message handlers