Fixed up the commands so that the messages which indicate completion are only sent when the action has acutally been completed: