minor code cosmetics
64bit support