better parsing of CSSes and an update for the test program