Fixes and some minor changes; improved search