RTL support + minor changes