added decompositions, minor fixes