Fixed paths for windows compatability, fixed linting issues, fixed minor doc bug
resolving merge issue