demo changes + hunter bugfix