MVC-10 Code review and fixes + refactored config.php