Adding 64bit functionality; more styling