I found the two areas you were talking about and updated the code to reflect those changes.