New modules and cleaned up usage of Google search.