fixed %llu and %lli errors under windows
added dep + reorder