rename handlers
create options handler and generic error handler