WYCS: more bug fixes
WYCS: working on getting more the tests which already worked to work again.