Add horizon configutation.  Other cleanup