WIP stop changes, misc