Added switch to 64-bit mode... still contains some hacks