Nothing really changed, just some updates

fix the dang search and push ugh
Merge remote-tracking branch 'origin/master' into canzhiye
fuck yeah!