improve edit mode, float support in client