Comments and a couple small fixes.