lots of small fixes
fix search