WYCS: lots of bug fixes and have now fully separated wycs from wyil.