cleaning up, getting stop to work.