Made some minor updates.

More incoming.... if I can get it to build at github's end.