add more fixes to bstack. hooks appear to be breaking stuff.