CLeanup recent changes
Add verbose option, tweak messages output
Rename script more appropriately