merge in rebuild changes
add 32/64 java switch