fix redirects

fixes #121, fixes #118