Various enhancements - bad commit message