changed a few things from Andy's config