config fix + code debug cleanup