cleaned up, added infobox, needs more work