message fix and resizing
merges