Fixed some bugs... I think.  Just networking, then the great merge...
By the way, the mod may need a new name after the two are combined; I wonder what it should be?