some fixes; change CSSHandler