stop unnecessarily extending the watches
fix gather and use it in status_lib for extra