Remove all single option handling from component. Small fixes. Update README