WYCS: possible bug fixes
WYCS: making some progress on a few things.