various line fixes