Updated.

Phew, that was a lot

I'll do the wishlist tomorrow