cleaner ls; cleaner path handling; cleanup cruft