Change to solr 3 only.
Update to solr 4.
Add finals where we can