Improve Short description and extend to elves