Resolved more problems.

Still have problem with empty line, but currently resolved by
checking for it and canceling out. It's probably related more
to the filletting than the drawing.