Comments and minor (untested) tweaks