Added 64bit option to config
Header cleanup