Added chordal evaluation
Added leap checking
cleaned up some unused variables