Fixed folder path & comments