Added hpo, fixed up some issues with sets