Refactor, messages and fixes