Updates to binds and a few performance tweaks