Comments and formal fixes