Fixes issue #2, implement l/li/line handling