Correct and add more prints