constant renaming
problem heuristics
problem independent heuristics
documentation
update doc
dev merge