Change description + small improvements