cosmetic
cosmetic and logging, fixes #3