Fix more instances of getting stuck, combining lines, and garbage on lines