alg2

The amalgamation functions are now included in the file alg2 and a few
errors have been fixed.