changed a bunch of configs based on client configs, added configs that were only in the client (used for most of the development)