Added CSS support; different improvements