-almost working fixes