upgraded 64-bit support, renamed methods