Cleanup messages a little.
Updates
More work