finish off the long to long long type change fixes for Win64
new version