various line improvements