Improved efficiency of best set for heuristic
Improved abstraction for training H
Merge remote-tracking branch 'origin/develop' into develop-experiments