debts updates and fix bugs