Tweaked the source in a few places.