Transformation fixes & improvements; closes #2