numerous small fixes
searching