cleaned a few things up in messages.c ... geez this is such old code