Added checkboxes and fixed selector problems.