minor changes from beta3