fixed some fucking Egor’s bugs