Add description and general comments