add watch, fix image load testing issue