Fix some spacing & debug code