fixes start stop issues and adds stop functionality