tooltip and registration fix