2nd part translate support + cleanup some things