Clean up, reverts, updates, this and that.

Thanks for Flyingboots for helping and using his updates too.