fix known bugs, ty @MayhemYDG for one