Moved default watch stated into init. Changed 'runonce' to 'watch'