ENH in progress fixing sm issues with other improvements