Fix some stuff, add search