unfucked a few more codes