Lightline improvements