improved redirects
major revamp