+search
+ui update
+performance update
+cleaned up some code