Final version?

and all the things else.