message and fixes