updates for new SM functions and other crap