No more warnings on 64 bit.  Cleaned up code.