Tweaks 3 17 13

Made getMessageText() simpler and cleaned up a couple things.