Fixed several issues
-added missing enabling of the pseudo sm
-corrected expressions checking for sm