Fixed some prints and debugging cleanup