Player and whale mechanics fix