Complete revision, 64 bit support, XE5 support