5/5-14 commit with a lot of new info
minor