small refactor, spit out more info on the page. Page is getting long, need to go in and style it now... eughh