With validation, style, and other small fixes