Couple exec fixes and code quality addressed
Improve metadata quality