Quite a lot of new stuff, preparing for next release