small listener improvements