various interaction improvements
various interaction improvements