Improove comments & versions