Working out saved stop stuff, fixed db bug