Improve messages & add comments