Fixed mistakes, added watch function, dissoc kill-ch from state