change to use STM, fixing 4 things