small fixes plus git hard restet