a few fixes
i just killed it