A few fixes, redirecting