Add alternative settings and some more comments