WYCS: a bunch of very minor little tweaks.
WYCS: minor bug fix