Add support for combining selectors with '+', fix bugs, remove unused methods.