Various improvments to nginx config