updates from testing bugs