Add messages
Fix relative path to macro