more fixes again lmao