This is the fixed version.  Fixes many niggling bugs.  Mainly legal ones. :)
