more refactoring, make our custom Transformer API compatible
drain fix for Transform
bump version