Comment changes and version fix