rejig and add 64bit detection