Fixed up some incomplete code and added report