Minor tweaks. Names and such. Some comment docs.