Cleaner, and updating now redirects properly