fix formatting issues that the working build has shown. fix bad merge issues.