Support for 64bit, and minor updates