comments, file path fixes