Some more details and cosmetic changes