Update version strings and description, clean up comments