few tweaks to user editing