cleaned up some formatting, hooked up hpi data