Added more output messages and fixed stuct