Update to functionally fix some weird wrong parts