:art: A few improvements