main changes

hopefully doesn’t screw it up