Adjusted message displays and cleaned up a ton of other stuff !