New descriptions and bugfix