More ls improvements