Move from Finite to SM
Fixes and updates