Removed noisy debug statements, added addl debug info