adding some more descriptions and fixing other bugs