Added better 64bit support and support for non-debug builds