Fix for broken OS detection when building under cygwin.
Some tweaks to type parameters.
Some tweaks to error messages for badly formed @Options.
Removed some @Timeouts
Marked some stories as done.
Formatting.