Fix typos
Clean up debug statements