WIP Dejanking
More fixen