Fixed some stuff that was for debugging purposes only