Fixed a couple of bugs.  Cleaned up notes a little.