Fixed bugs, implemented a couple of selectors.