Update & bugs. fixing