Various style improvements, nearing completion..