Updated to reflect new minor features.