Updates to style, and more work done