Reorganize a bit
Fix binding and enabling SM after SM resumption fails
Update to use fixed wildemitter