Fixed some issues and faulty printout still exist