New SQL statements and some stylistic goodies.