minor updates based on bug verification