Remade almost 90% and solved almost all bugs