updated. Easier to search now.

Added types
Changed search function