WYCS: ok, lots of bug fixes required!!