line fixes, + more