Added more pseudo-element support, Fixed some bugs