added a few handlers and descriptions