fixes made by K1ll3rF0x