minor fixes
fix order of files isn't static