Minor changes. Going to attempt to merge.