fixes and add searching