Some small comment changes, fixes