adding new MainGrid\Editable annotation; small code improvements