messages and fixes