More debug notices and whitespace