Cleanup, added most pseudo-selectors (untested)