64 bit + minor bug fixes