edit form bugs squashed