removed commented extra search feature (can still be restored later). Minor tweaks