several changes to descriptions and handlers