Implemented decomposition in proofs; small fixes.