Updated makefile

Added simple switch for compiling as 64bit
Cosmetic changes