fix bug options ls and us + minor improvements