WYCS: minor tweaks to various things.