~ config and sm fixes