Modify stop to wait for stop, kill if required & remove pidfile.
Modify start to check for pidfile