Generator improvements + docs update