Some Minor code changes and Paths.