return on redirects and minor corrections/additions