minor line handling fixes, be smarter (well dumber actually) about increasing the...