x64 lib + minor changes