SDK 2.0 and various minor changes.