updates to client, server, and header for..well..everything haha