Whitespace/extra debug changes