another couple bugs