last changes

I left where it says STOP