transform

**rename
**and other minor stuff