debug section and small updates