Still messed up the merge! Added some minor updates.