General update

Updated comments and now grabs more data