Addressed some of Cam's comments, need help on some others. Have at it