WyCS: bug fix for various minor problems.