exposed generic handler and methods; some corrections