message refactoring
messages initialized correctly
updated todo