3.2 support + minor features