Part 2 + global style fixes