fixed default merges
renamed invalidate to destroy
mostly var case change