more styling and mergefixing