Added more docs and added watch and notify functions