First round of updates per @ocramius.