Style and more fixes.