Updated a few changes. Looks like it is all good in the first pass!