Don't know why these files got deleted by git.
Ok, fixed up a few things.
WYCS: some minor fixes.