fix version string
fix comment support