Many updates before 2.0 release