Updated commits and fixed a bug in the shutdown of multiple servers that would have an index out of range error