lots of changes for 3.6.0.