Very minor tweaks
WYCS: working on adding support for substitution of general equations #231