Redirects and bug fixes

Closes issue #14