Fixed more prints and debug cleanup