Fixing redirects, closes #67, closes #68