Fix the implementation of watch and add ./vendor watch