lots of small changes towards 2.0