minor changes to fix run-away line, etc