role enhancement, bug fixes