Added field return formatting, more debug code management