style updates, better validation