styling and more merge fixes