Clean up, added 64BIT and UNICODE