More work on edit control