fixed comments section and schemas