Improve messages
Tweak use of arrays