Fixed a few bugs with long running calls of stop and restart... also fixed a few errors