Fixed struct, added line print and comments