fixed Transform Problems
code cleanup