buncho fixes