WYCS: some obvious improvements ... only one test case failing now!!