Merging, and fixing style problems