more find fixes
mor user fixes