Fixed most things, preserve and punclaim not working