Some code clean up, also added another api call to get some of the data I wanted.
Lousy commit but oh well more details later, havent had timey