fixed some of the problems but mandor still complains about a missing chi4 torsion for proline
merge commit