improved search and made various changes off feedback