Lots of little fixes; the system is now usable if you know how to avoid the unimplemented bits, though a bug about I7 inclusions in I6 comments remains.