Alpha 2 - Torch first fix, some changes