updated formatting, server names, and functionality