Fixes to the code and the addition of a possibly working goal base finder