Fixes and tweaks for basic lines