this should fix some of the Git issues that arose from the last two commits