comment out bits not relevant / disagreements. reconcile this fork with the latest jeddy3 updates