64 bit prep
build improvments