working fixes final