working fixes!