minor changes

unified sm builder, etc