Fixed a bug or two
Fixed /stop