Use the new close tool in greatmancodetools. Also closed some JDBC instances where I forgot.