More generator cleanup. Generate a random start also.