setup home handler, other handler changes