working fixes.