Minor renamings
Completely reworked search
Some minor fixes and more precise callbacks returning
In the process of migrating to wait.for
Finished migrating to wait.for