correct file extensions, and other minor fixes