Further improvements, inc styling.