Major bug fixes, please pull

There were recently reported and fixed some pretty major bugs (things like nested child selectors were broken). Please consider pulling them.