cleanup thunk_bx
name fix
name fix again