more improvements + authorizers